From 11bfc22a860dd99e9b404161ac66ca2282bc5af4 Mon Sep 17 00:00:00 2001
From: tsteven4 <tsteven4@gmail.com>
Date: Thu, 17 Sep 2015 23:32:18 -0600
Subject: [PATCH] switch travis to containers and restore travis usage of
 build_and_test.

---
 .travis.yml | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 050b03bd4..8c5f68fbd 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,10 +1,15 @@
+sudo: false
 language: cpp
 compiler:
   - gcc
   - clang
-before_install:
-  - sudo apt-get update -qq
-  - sudo apt-get install -y valgrind expat
+addons:
+  apt:
+    packages:
+    - expat
+    - fop
+    - valgrind
+    - xsltproc
 script:
- - cd gpsbabel ; ./configure && make -j3 all && bash ./testo  && bash ./vtesto
-# TODO: build doc, GUI, mac
+ - ./build_and_test
+# TODO: build mac
-- 
2.30.2